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.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 32F22C3A5A6 for ; Thu, 29 Aug 2019 22:49:08 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02E722189D for ; Thu, 29 Aug 2019 22:49:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="iThSoqqr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02E722189D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D51D759C6; Thu, 29 Aug 2019 22:49:05 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3F3854687 for ; Thu, 29 Aug 2019 22:48:02 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3D048887 for ; Thu, 29 Aug 2019 22:48:01 +0000 (UTC) Received: from localhost (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AC0992173E; Thu, 29 Aug 2019 22:48:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567118881; bh=AF7KaaN0SPHZVCzMo4I0QlziT4Dc084NALpVNTE66xw=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=iThSoqqrWY1rBHxgi2xpVYpYO5u/qkuBWYnStULaaLWA7uxqFPq1k2ifNvRpQjCsx oSUbcFoQVW+Q2dWM8uumjkvHntXywq9XuABVd8lVFeKIULhiYmtzH1Oa21ErYKv5Q2 UmYWrhepeTu37larup9+65efIBZ3rbyjcLiAAXV4= Date: Thu, 29 Aug 2019 15:48:00 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-T480s To: Christoph Hellwig Subject: Re: [PATCH 09/11] swiotlb-xen: remove page-coherent.h In-Reply-To: <20190826121944.515-10-hch@lst.de> Message-ID: References: <20190826121944.515-1-hch@lst.de> <20190826121944.515-10-hch@lst.de> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Cc: Stefano Stabellini , Konrad Rzeszutek Wilk , x86@kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On Mon, 26 Aug 2019, Christoph Hellwig wrote: > The only thing left of page-coherent.h is two functions implemented by > the architecture for non-coherent DMA support that are never called for > fully coherent architectures. Just move the prototypes for those to > swiotlb-xen.h instead. > > Signed-off-by: Christoph Hellwig Reviewed-by: Stefano Stabellini > --- > arch/arm/include/asm/xen/page-coherent.h | 2 -- > arch/arm64/include/asm/xen/page-coherent.h | 2 -- > arch/x86/include/asm/xen/page-coherent.h | 11 ----------- > drivers/xen/swiotlb-xen.c | 3 --- > include/Kbuild | 1 - > include/xen/arm/page-coherent.h | 10 ---------- > include/xen/swiotlb-xen.h | 6 ++++++ > 7 files changed, 6 insertions(+), 29 deletions(-) > delete mode 100644 arch/arm/include/asm/xen/page-coherent.h > delete mode 100644 arch/arm64/include/asm/xen/page-coherent.h > delete mode 100644 arch/x86/include/asm/xen/page-coherent.h > delete mode 100644 include/xen/arm/page-coherent.h > > diff --git a/arch/arm/include/asm/xen/page-coherent.h b/arch/arm/include/asm/xen/page-coherent.h > deleted file mode 100644 > index 27e984977402..000000000000 > --- a/arch/arm/include/asm/xen/page-coherent.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#include > diff --git a/arch/arm64/include/asm/xen/page-coherent.h b/arch/arm64/include/asm/xen/page-coherent.h > deleted file mode 100644 > index 27e984977402..000000000000 > --- a/arch/arm64/include/asm/xen/page-coherent.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#include > diff --git a/arch/x86/include/asm/xen/page-coherent.h b/arch/x86/include/asm/xen/page-coherent.h > deleted file mode 100644 > index c9c8398a31ff..000000000000 > --- a/arch/x86/include/asm/xen/page-coherent.h > +++ /dev/null > @@ -1,11 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_X86_XEN_PAGE_COHERENT_H > -#define _ASM_X86_XEN_PAGE_COHERENT_H > - > -static inline void xen_dma_sync_single_for_cpu(struct device *hwdev, > - dma_addr_t handle, size_t size, enum dma_data_direction dir) { } > - > -static inline void xen_dma_sync_single_for_device(struct device *hwdev, > - dma_addr_t handle, size_t size, enum dma_data_direction dir) { } > - > -#endif /* _ASM_X86_XEN_PAGE_COHERENT_H */ > diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c > index a642e284f1e2..95911ff9c11c 100644 > --- a/drivers/xen/swiotlb-xen.c > +++ b/drivers/xen/swiotlb-xen.c > @@ -35,9 +35,6 @@ > #include > #include > > -#include > -#include > - > #include > /* > * Used to do a quick range check in swiotlb_tbl_unmap_single and > diff --git a/include/Kbuild b/include/Kbuild > index c38f0d46b267..cce5cf6abf89 100644 > --- a/include/Kbuild > +++ b/include/Kbuild > @@ -1189,7 +1189,6 @@ header-test- += video/vga.h > header-test- += video/w100fb.h > header-test- += xen/acpi.h > header-test- += xen/arm/hypercall.h > -header-test- += xen/arm/page-coherent.h > header-test- += xen/arm/page.h > header-test- += xen/balloon.h > header-test- += xen/events.h > diff --git a/include/xen/arm/page-coherent.h b/include/xen/arm/page-coherent.h > deleted file mode 100644 > index 635492d41ebe..000000000000 > --- a/include/xen/arm/page-coherent.h > +++ /dev/null > @@ -1,10 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _XEN_ARM_PAGE_COHERENT_H > -#define _XEN_ARM_PAGE_COHERENT_H > - > -void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, > - phys_addr_t paddr, size_t size, enum dma_data_direction dir); > -void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, > - phys_addr_t paddr, size_t size, enum dma_data_direction dir); > - > -#endif /* _XEN_ARM_PAGE_COHERENT_H */ > diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h > index 5e4b83f83dbc..a7c642872568 100644 > --- a/include/xen/swiotlb-xen.h > +++ b/include/xen/swiotlb-xen.h > @@ -2,8 +2,14 @@ > #ifndef __LINUX_SWIOTLB_XEN_H > #define __LINUX_SWIOTLB_XEN_H > > +#include > #include > > +void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, > + phys_addr_t paddr, size_t size, enum dma_data_direction dir); > +void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, > + phys_addr_t paddr, size_t size, enum dma_data_direction dir); > + > extern int xen_swiotlb_init(int verbose, bool early); > extern const struct dma_map_ops xen_swiotlb_dma_ops; > > -- > 2.20.1 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu