Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6398826imu; Wed, 14 Nov 2018 00:26:28 -0800 (PST) X-Google-Smtp-Source: AJdET5fxLUoAq3OuCUgJUNzjFnRrvF7dibOv6aoi2rFw+ryIQVnAE+4pd8WsSH4JSRuOBwBVumVJ X-Received: by 2002:a63:d10:: with SMTP id c16mr896033pgl.382.1542183988614; Wed, 14 Nov 2018 00:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183988; cv=none; d=google.com; s=arc-20160816; b=CSTxGPoLINAxT3o8HC5ximLecKC8d13pW83KfU37+9vQze00hiIs9w7XPeUVQZ8V+C rmlgtH+pGSTo1UX5wZCHrgrYrybddWRT/FmPnWdaTFe55v2IzMWe5+l925+yuXDpwQKB lWSHfO9Fr8bSVMPjQ12zPKXllvhVzgEODhkSc0DQ8zNPY245PHhO3/QwlW6oLuEAVtjV TNKwdlm2WeMy23qdzMVbTSED0B4VtI/ciM3bxygXKvqHlJg44kdg860chV0tcgup38yj Neyl5zyhar9pqCFpA2BJzgabQRU8/dBRp3kLhqxg55506Y5ez3JSJXQuutpm7QF2EsSK FK3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cGKlbU+oXvVAhC9QKwibc5KJRN1/gP8lP8pMNbJHI/s=; b=jFSOAHnC/ru9YvHnGxQL80u+U3K67vqsmzZzpaEhIITUqCWP3hXVqR+Z2VnokOAxqL UqI5sOaWLc3UfySyEeZTpG2ZiY4FHdh5oniYjbzmsgjuK0BW+8N0esEyNaLgz8dkVqK+ mFgUw073pwIsJtMDmEgbiXCqjiN6IR04iA0XUtssWTAhZfR/Z8/qQGykc5l6aOOpLeXb Q1X/trdXxs4pMIFahAi+fCrHzo2pixJmLAfWvNsv4RFu5M6aMOnyiiAfWg2K5R1OfKem hrBQ4P3bqwber/OyDReQxftPUzgk1sSzwDagJUhOz93LSzvmXNQP20dP5oavwNXDzCZX SlVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=uBHwx7q1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e39-v6si23395595plg.366.2018.11.14.00.26.13; Wed, 14 Nov 2018 00:26:28 -0800 (PST) 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; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=uBHwx7q1; 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 S1733128AbeKNS1K (ORCPT + 99 others); Wed, 14 Nov 2018 13:27:10 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:50160 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732043AbeKNS1K (ORCPT ); Wed, 14 Nov 2018 13:27:10 -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=cGKlbU+oXvVAhC9QKwibc5KJRN1/gP8lP8pMNbJHI/s=; b=uBHwx7q1acfmjD/ZLBF1dylHjd inhGc1Qt0pHe8F6EN1uMv1mJnvAWhG/BCPCdkVxdznQpiyR74bN7A9fBaG42cYcaD5hRY/hilfGYq Mbn3AiXZpa5LhBfqTbbDZN8IeT3+J6C3CMlljhcWOCQxtxhQy1RdMNfr9yDoonbDSlau3slibb6gI +b1c/EWwG6UWdrBvC16xYmF1f2TMmywSbgoo5T+jSypezJ9gbJsolvz88A2RMUZDT07OBaAmGP+86 8pPJsX5700ZGCt73NfA6EDDONlesXd+TWyEvOT5qi8DS6py2eotw1JVdWFx8fzeACkufQIqeHSJG/ o4WTcM3w==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqTh-0005Bc-Lf; Wed, 14 Nov 2018 08:24:50 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 34/34] powerpc/dma: trim the fat from Date: Wed, 14 Nov 2018 09:23:14 +0100 Message-Id: <20181114082314.8965-35-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-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 There is no need to provide anything but get_arch_dma_ops to . More the remaining declarations to and drop all the includes. Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/dma-mapping.h | 29 ------------------- arch/powerpc/include/asm/iommu.h | 10 +++++++ arch/powerpc/platforms/44x/ppc476.c | 1 + arch/powerpc/platforms/85xx/corenet_generic.c | 1 + arch/powerpc/platforms/85xx/qemu_e500.c | 1 + arch/powerpc/sysdev/fsl_pci.c | 1 + 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index a59c42879194..565d6f74b189 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -1,37 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2004 IBM - * - * Implements the generic device dma API for powerpc. - * the pci and vio busses */ #ifndef _ASM_DMA_MAPPING_H #define _ASM_DMA_MAPPING_H -#ifdef __KERNEL__ - -#include -#include -/* need struct page definitions */ -#include -#include -#include -#include -#include - -static inline unsigned long device_to_mask(struct device *dev) -{ - if (dev->dma_mask && *dev->dma_mask) - return *dev->dma_mask; - /* Assume devices without mask can take 32 bit addresses */ - return 0xfffffffful; -} - -/* - * Available generic sets of operations - */ -#ifdef CONFIG_PPC64 -extern const struct dma_map_ops dma_iommu_ops; -#endif static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) { @@ -43,5 +15,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) return NULL; } -#endif /* __KERNEL__ */ #endif /* _ASM_DMA_MAPPING_H */ diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h index 5128aac8e165..46a8d4716d90 100644 --- a/arch/powerpc/include/asm/iommu.h +++ b/arch/powerpc/include/asm/iommu.h @@ -332,5 +332,15 @@ extern bool iommu_fixed_is_weak; #define iommu_fixed_is_weak false #endif +extern const struct dma_map_ops dma_iommu_ops; + +static inline unsigned long device_to_mask(struct device *dev) +{ + if (dev->dma_mask && *dev->dma_mask) + return *dev->dma_mask; + /* Assume devices without mask can take 32 bit addresses */ + return 0xfffffffful; +} + #endif /* __KERNEL__ */ #endif /* _ASM_IOMMU_H */ diff --git a/arch/powerpc/platforms/44x/ppc476.c b/arch/powerpc/platforms/44x/ppc476.c index e55933f9cd55..a5e61e5c16e2 100644 --- a/arch/powerpc/platforms/44x/ppc476.c +++ b/arch/powerpc/platforms/44x/ppc476.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index b0dac307bebf..0ea13697189e 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c index 27631c607f3d..c52c8f9e8385 100644 --- a/arch/powerpc/platforms/85xx/qemu_e500.c +++ b/arch/powerpc/platforms/85xx/qemu_e500.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "smp.h" diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 964a4aede6b1..9584765dbe3b 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include -- 2.19.1