From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: Juergen Gross <jgross@suse.com>,
linux-s390@vger.kernel.org, linux-hyperv@vger.kernel.org,
Stefano Stabellini <sstabellini@kernel.org>,
linux-ia64@vger.kernel.org, Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
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 <boris.ostrovsky@oracle.com>,
David Woodhouse <dwmw2@infradead.org>,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH 11/11] x86: remove cruft from <asm/dma-mapping.h>
Date: Tue, 22 Feb 2022 16:35:14 +0100 [thread overview]
Message-ID: <20220222153514.593231-12-hch@lst.de> (raw)
In-Reply-To: <20220222153514.593231-1-hch@lst.de>
<asm/dma-mapping.h> gets pulled in by all drivers using the DMA API.
Remove x86 internal variables and unnecessary includes from it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/x86/include/asm/dma-mapping.h | 11 -----------
arch/x86/include/asm/iommu.h | 2 ++
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 256fd8115223d..1c66708e30623 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -2,17 +2,6 @@
#ifndef _ASM_X86_DMA_MAPPING_H
#define _ASM_X86_DMA_MAPPING_H
-/*
- * IOMMU interface. See Documentation/core-api/dma-api-howto.rst and
- * Documentation/core-api/dma-api.rst for documentation.
- */
-
-#include <linux/scatterlist.h>
-#include <asm/io.h>
-
-extern int iommu_merge;
-extern int panic_on_overflow;
-
extern const struct dma_map_ops *dma_ops;
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
index dba89ed40d38d..0bef44d30a278 100644
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -8,6 +8,8 @@
extern int force_iommu, no_iommu;
extern int iommu_detected;
+extern int iommu_merge;
+extern int panic_on_overflow;
#ifdef CONFIG_SWIOTLB
extern bool x86_swiotlb_enable;
--
2.30.2
next prev parent reply other threads:[~2022-02-22 15:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 15:35 cleanup swiotlb initialization Christoph Hellwig
2022-02-22 15:35 ` [PATCH 01/11] dma-direct: use is_swiotlb_active in dma_direct_map_page Christoph Hellwig
2022-02-24 10:26 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 02/11] swiotlb: make swiotlb_exit a no-op if SWIOTLB_FORCE is set Christoph Hellwig
2022-02-24 10:29 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 03/11] swiotlb: simplify swiotlb_max_segment Christoph Hellwig
2022-02-24 10:34 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 04/11] swiotlb: rename swiotlb_late_init_with_default_size Christoph Hellwig
2022-02-24 10:36 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 05/11] swiotlb: pass a gfp_mask argument to swiotlb_init_late Christoph Hellwig
2022-02-24 10:41 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 06/11] MIPS/octeon: use swiotlb_init instead of open coding it Christoph Hellwig
2022-02-22 15:35 ` [PATCH 07/11] x86: remove the IOMMU table infrastructure Christoph Hellwig
2022-02-24 10:18 ` Anshuman Khandual
2022-02-22 15:35 ` [PATCH 08/11] swiotlb: make the swiotlb_init interface more useful Christoph Hellwig
2022-02-22 15:35 ` [PATCH 09/11] swiotlb: add a SWIOTLB_ANY flag to lift the low memory restriction Christoph Hellwig
2022-02-22 15:35 ` [PATCH 10/11] swiotlb: merge swiotlb-xen initialization into swiotlb Christoph Hellwig
2022-02-24 10:16 ` Anshuman Khandual
2022-02-22 15:35 ` Christoph Hellwig [this message]
2022-02-24 0:57 ` cleanup swiotlb initialization Boris Ostrovsky
2022-02-24 15:58 ` Christoph Hellwig
2022-02-24 16:18 ` Boris Ostrovsky
2022-02-24 16:39 ` Christoph Hellwig
2022-02-24 17:07 ` Boris Ostrovsky
2022-02-25 8:47 ` Christoph Hellwig
2022-02-25 15:24 ` Boris Ostrovsky
-- strict thread matches above, loose matches on Subject: below --
2022-02-27 14:30 cleanup swiotlb initialization v2 Christoph Hellwig
2022-02-27 14:30 ` [PATCH 11/11] x86: remove cruft from <asm/dma-mapping.h> Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220222153514.593231-12-hch@lst.de \
--to=hch@lst.de \
--cc=baolu.lu@linux.intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=robin.murphy@arm.com \
--cc=sstabellini@kernel.org \
--cc=tboot-devel@lists.sourceforge.net \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).