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 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DDC3C433F5 for ; Tue, 22 Feb 2022 15:35:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0B44960EF6; Tue, 22 Feb 2022 15:35:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7EoMEqw9l3XX; Tue, 22 Feb 2022 15:35:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id BE2F260ED7; Tue, 22 Feb 2022 15:35:24 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7E419C0021; Tue, 22 Feb 2022 15:35:24 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0FC26C0011 for ; Tue, 22 Feb 2022 15:35:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E4E5381280 for ; Tue, 22 Feb 2022 15:35:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=infradead.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7rtCWVpfbHoz for ; Tue, 22 Feb 2022 15:35:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by smtp1.osuosl.org (Postfix) with ESMTPS id D14E380D8C for ; Tue, 22 Feb 2022 15:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=16nouNo24ejNp/bHBqFUpHpMmYYgIL88sf6fCnA5oxw=; b=Evl4OhdNJ9vFGI4KBDyMJ2uY4v ahlgofRSzpQsvpw+qbnrer3aKbB3W7rQQSWiEtHPv1GOLM+A33NRlrQJtcbKPQZsq8ZJ0Ur1vnRRo g3p2qbcU3jr70C8mOofs0g3hzUW4uVlAhWSisJaMMZC6wOX8A4tQ90Hk2vLNc+kmD6djArF9T8eoW 9u4suY2drGIZP4mp6SqQGG0Ti0UU5XC5RKqrHf1fSU30Q1huprZkGdvFxmCo5kR0DDj/lBC1BQkHm KDzcPMMmVkYt9l5nGrPt5RR+4vvyTE3FSJuO351gMgi78pWHFgl6Edsr7ZHkmjhcz+ut06I1oIQyx rYiE4tRw==; Received: from [2001:4bb8:198:f8fc:c22a:ebfc:be8d:63c2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMXC9-00AGnS-1u; Tue, 22 Feb 2022 15:35:17 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Subject: cleanup swiotlb initialization Date: Tue, 22 Feb 2022 16:35:03 +0100 Message-Id: <20220222153514.593231-1-hch@lst.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: Juergen Gross , linux-s390@vger.kernel.org, linux-hyperv@vger.kernel.org, Stefano Stabellini , linux-ia64@vger.kernel.org, Robin Murphy , x86@kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, tboot-devel@lists.sourceforge.net, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, Boris Ostrovsky , David Woodhouse , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 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 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi all, this series tries to clean up the swiotlb initialization, including that of swiotlb-xen. To get there is also removes the x86 iommu table infrastructure that massively obsfucates the initialization path. Git tree: git://git.infradead.org/users/hch/misc.git swiotlb-init-cleanup Gitweb: http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/swiotlb-init-cleanup Diffstat: arch/ia64/include/asm/iommu_table.h | 7 - arch/x86/include/asm/iommu_table.h | 102 ------------------- arch/x86/include/asm/swiotlb.h | 30 ----- arch/x86/kernel/pci-iommu_table.c | 77 -------------- arch/x86/kernel/pci-swiotlb.c | 77 -------------- arch/x86/xen/pci-swiotlb-xen.c | 96 ------------------ b/arch/arm/mm/init.c | 6 - b/arch/arm/xen/mm.c | 23 ++-- b/arch/arm64/mm/init.c | 6 - b/arch/ia64/mm/init.c | 4 b/arch/mips/cavium-octeon/dma-octeon.c | 15 -- b/arch/mips/loongson64/dma.c | 2 b/arch/mips/pci/pci-octeon.c | 2 b/arch/mips/sibyte/common/dma.c | 2 b/arch/powerpc/include/asm/svm.h | 4 b/arch/powerpc/include/asm/swiotlb.h | 1 b/arch/powerpc/mm/mem.c | 6 - b/arch/powerpc/platforms/pseries/setup.c | 3 b/arch/powerpc/platforms/pseries/svm.c | 26 ---- b/arch/riscv/mm/init.c | 8 - b/arch/s390/mm/init.c | 3 b/arch/x86/include/asm/dma-mapping.h | 12 -- b/arch/x86/include/asm/gart.h | 5 b/arch/x86/include/asm/iommu.h | 8 + b/arch/x86/include/asm/xen/page.h | 5 b/arch/x86/include/asm/xen/swiotlb-xen.h | 2 b/arch/x86/kernel/Makefile | 2 b/arch/x86/kernel/amd_gart_64.c | 5 b/arch/x86/kernel/aperture_64.c | 14 -- b/arch/x86/kernel/cpu/mshyperv.c | 8 - b/arch/x86/kernel/pci-dma.c | 114 +++++++++++++++++---- b/arch/x86/kernel/tboot.c | 1 b/arch/x86/kernel/vmlinux.lds.S | 12 -- b/arch/x86/mm/mem_encrypt_amd.c | 3 b/arch/x86/pci/sta2x11-fixup.c | 2 b/arch/x86/xen/Makefile | 2 b/drivers/iommu/amd/init.c | 6 - b/drivers/iommu/amd/iommu.c | 5 b/drivers/iommu/intel/dmar.c | 6 - b/drivers/xen/swiotlb-xen.c | 132 ------------------------- b/include/linux/dmar.h | 6 - b/include/linux/swiotlb.h | 22 ++-- b/include/trace/events/swiotlb.h | 29 +---- b/include/xen/arm/page.h | 1 b/include/xen/swiotlb-xen.h | 8 + b/kernel/dma/direct.h | 2 b/kernel/dma/swiotlb.c | 163 +++++++++++++++---------------- 47 files changed, 258 insertions(+), 817 deletions(-) _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu