From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84445C43387 for ; Mon, 14 Jan 2019 09:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 530B220663 for ; Mon, 14 Jan 2019 09:43:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="FF/08zZa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726889AbfANJnC (ORCPT ); Mon, 14 Jan 2019 04:43:02 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44244 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726449AbfANJnB (ORCPT ); Mon, 14 Jan 2019 04:43:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=F3GDi2Vs0B43E3GvUFUva6gVTg7Bi7GThMMrqk0BSCk=; b=FF/08zZaMeNUiE9dHClCQjeVki 1ccFT9HzzusWSIRY8Wa0uulcX4TXNZM17YxiTMkfzLRu8c0p1hvMm44SbQQzeoQ5lBdB57+s0vjvJ KAAlbAFdevmhZakd9vkYnfTL0Zvcdn0w3VNAu9sjAMNwde2+K/cB5EJcmkUKgmfU10IRHQ/gUEDhs W2g9c5WyQ/BWGCEGeteueZKYdYMSXzxjw+FMroOvqsD0TAMW1bbJMSHidu0crxI2YjF3229OhJfp5 XM662b2EXxL5tmQJ+Og8W9xpI74IiGxTjBvmL5oVDdjW3+xwY2D0FovjXrMD1zQfwrs9XpZdMeBIj yWdLFSYA==; Received: from 089144213167.atnat0022.highway.a1.net ([89.144.213.167] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1giyli-0006q2-NE; Mon, 14 Jan 2019 09:42:55 +0000 From: Christoph Hellwig To: Robin Murphy Cc: Joerg Roedel , Catalin Marinas , Will Deacon , Tom Lendacky , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/19] dma-iommu: don't depend on CONFIG_DMA_DIRECT_REMAP Date: Mon, 14 Jan 2019 10:41:56 +0100 Message-Id: <20190114094159.27326-17-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114094159.27326-1-hch@lst.de> References: <20190114094159.27326-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For entirely dma coherent architectures there is no good reason to ever remap dma coherent allocation. Move all the remap and pool code under CONFIG_DMA_DIRECT_REMAP ifdefs, and drop the Kconfig dependency. Signed-off-by: Christoph Hellwig --- drivers/iommu/Kconfig | 1 - drivers/iommu/dma-iommu.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 8b13fb7d0263..d9a25715650e 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -94,7 +94,6 @@ config IOMMU_DMA select IOMMU_API select IOMMU_IOVA select NEED_SG_DMA_LENGTH - depends on DMA_DIRECT_REMAP config FSL_PAMU bool "Freescale IOMMU support" diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index fd25c995bde4..e27909771d55 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -502,6 +502,7 @@ static void *iommu_dma_alloc_contiguous(struct device *dev, size_t size, return page_address(page); } +#ifdef CONFIG_DMA_DIRECT_REMAP static void __iommu_dma_free_pages(struct page **pages, int count) { while (count--) @@ -775,6 +776,7 @@ static void *iommu_dma_alloc_noncoherent(struct device *dev, size_t size, gfp, attrs); return iommu_dma_alloc_remap(dev, size, dma_handle, gfp, attrs); } +#endif /* CONFIG_DMA_DIRECT_REMAP */ static void iommu_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir) @@ -1057,6 +1059,7 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, */ gfp |= __GFP_ZERO; +#ifdef CONFIG_DMA_DIRECT_REMAP if (!dev_is_dma_coherent(dev)) return iommu_dma_alloc_noncoherent(dev, size, dma_handle, gfp, attrs); @@ -1064,6 +1067,7 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, if (gfpflags_allow_blocking(gfp) && !(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) return iommu_dma_alloc_remap(dev, size, dma_handle, gfp, attrs); +#endif return iommu_dma_alloc_contiguous(dev, size, dma_handle, gfp, attrs); } @@ -1083,6 +1087,7 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr, * * Hence how dodgy the below logic looks... */ +#ifdef CONFIG_DMA_DIRECT_REMAP if (dma_in_atomic_pool(cpu_addr, PAGE_ALIGN(size))) { iommu_dma_free_pool(dev, size, cpu_addr, dma_handle); return; @@ -1096,6 +1101,7 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr, page = vmalloc_to_page(cpu_addr); dma_common_free_remap(cpu_addr, PAGE_ALIGN(size), VM_USERMAP); } else +#endif page = virt_to_page(cpu_addr); iommu_dma_free_contiguous(dev, size, page, dma_handle); @@ -1119,11 +1125,13 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, if (off >= count || user_count > count - off) return -ENXIO; +#ifdef CONFIG_DMA_DIRECT_REMAP if (is_vmalloc_addr(cpu_addr)) { if (!(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) return iommu_dma_mmap_remap(cpu_addr, size, vma); pfn = vmalloc_to_pfn(cpu_addr); } else +#endif pfn = page_to_pfn(virt_to_page(cpu_addr)); return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff, @@ -1137,11 +1145,13 @@ static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, struct page *page; int ret; +#ifdef CONFIG_DMA_DIRECT_REMAP if (is_vmalloc_addr(cpu_addr)) { if (!(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) return iommu_dma_get_sgtable_remap(sgt, cpu_addr, size); page = vmalloc_to_page(cpu_addr); } else +#endif page = virt_to_page(cpu_addr); ret = sg_alloc_table(sgt, 1, GFP_KERNEL); -- 2.20.1