From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
adi-buildroot-devel@lists.sourceforge.net,
linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org,
Michal Simek <monstr@monstr.eu>,
linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, Guan Xuetao <gxt@mprc.pku.edu.cn>,
x86@kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 57/67] ia64: clean up swiotlb support
Date: Fri, 29 Dec 2017 09:19:01 +0100 [thread overview]
Message-ID: <20171229081911.2802-58-hch__37599.307325627$1514535925$gmane$org@lst.de> (raw)
In-Reply-To: <20171229081911.2802-1-hch@lst.de>
Move the few remaining bits of swiotlb glue towards their callers,
and remove the pointless on ia64 swiotlb variable.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/ia64/include/asm/dma-mapping.h | 1 -
arch/ia64/include/asm/swiotlb.h | 18 ------------------
arch/ia64/kernel/dma-mapping.c | 9 +++++++++
arch/ia64/kernel/pci-dma.c | 12 ++++++++++--
arch/ia64/kernel/pci-swiotlb.c | 36 ------------------------------------
drivers/iommu/intel-iommu.c | 2 +-
6 files changed, 20 insertions(+), 58 deletions(-)
delete mode 100644 arch/ia64/include/asm/swiotlb.h
delete mode 100644 arch/ia64/kernel/pci-swiotlb.c
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index eabee56d995c..76e4d6632d68 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -8,7 +8,6 @@
*/
#include <asm/machvec.h>
#include <linux/scatterlist.h>
-#include <asm/swiotlb.h>
#include <linux/dma-debug.h>
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h
deleted file mode 100644
index 841e2c7d0b21..000000000000
--- a/arch/ia64/include/asm/swiotlb.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef ASM_IA64__SWIOTLB_H
-#define ASM_IA64__SWIOTLB_H
-
-#include <linux/dma-mapping.h>
-#include <linux/swiotlb.h>
-
-#ifdef CONFIG_SWIOTLB
-extern int swiotlb;
-extern void pci_swiotlb_init(void);
-#else
-#define swiotlb 0
-static inline void pci_swiotlb_init(void)
-{
-}
-#endif
-
-#endif /* ASM_IA64__SWIOTLB_H */
diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
index 7a82c9259609..f2d57e66fd86 100644
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/dma-mapping.h>
+#include <linux/swiotlb.h>
#include <linux/export.h>
/* Set this to 1 if there is a HW IOMMU in the system */
@@ -23,3 +24,11 @@ const struct dma_map_ops *dma_get_ops(struct device *dev)
return dma_ops;
}
EXPORT_SYMBOL(dma_get_ops);
+
+#ifdef CONFIG_SWIOTLB
+void __init swiotlb_dma_init(void)
+{
+ dma_ops = &swiotlb_dma_ops;
+ swiotlb_init(1);
+}
+#endif
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 3ba87c22dfbc..35e0cad33b7d 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -104,8 +104,16 @@ void __init pci_iommu_alloc(void)
detect_intel_iommu();
#ifdef CONFIG_SWIOTLB
- pci_swiotlb_init();
-#endif
+ if (!iommu_detected) {
+#ifdef CONFIG_IA64_GENERIC
+ printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
+ machvec_init("dig");
+ swiotlb_dma_init();
+#else
+ panic("Unable to find Intel IOMMU");
+#endif /* CONFIG_IA64_GENERIC */
+ }
+#endif /* CONFIG_SWIOTLB */
}
#endif
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
deleted file mode 100644
index 0f8d5fbd86bd..000000000000
--- a/arch/ia64/kernel/pci-swiotlb.c
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Glue code to lib/swiotlb.c */
-
-#include <linux/pci.h>
-#include <linux/gfp.h>
-#include <linux/cache.h>
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <linux/swiotlb.h>
-#include <asm/dma.h>
-#include <asm/iommu.h>
-#include <asm/machvec.h>
-
-int swiotlb __read_mostly;
-EXPORT_SYMBOL(swiotlb);
-
-void __init swiotlb_dma_init(void)
-{
- dma_ops = &swiotlb_dma_ops;
- swiotlb_init(1);
-}
-
-void __init pci_swiotlb_init(void)
-{
- if (!iommu_detected) {
-#ifdef CONFIG_IA64_GENERIC
- swiotlb = 1;
- printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
- machvec_init("dig");
- swiotlb_init(1);
- dma_ops = &swiotlb_dma_ops;
-#else
- panic("Unable to find Intel IOMMU");
-#endif
- }
-}
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 6c9df0773b78..569a9328e53e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4807,7 +4807,7 @@ int __init intel_iommu_init(void)
up_write(&dmar_global_lock);
pr_info("Intel(R) Virtualization Technology for Directed I/O\n");
-#ifdef CONFIG_SWIOTLB
+#if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB)
swiotlb = 0;
#endif
dma_ops = &intel_dma_ops;
--
2.14.2
next prev parent reply other threads:[~2017-12-29 8:19 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171229081911.2802-1-hch@lst.de>
2017-12-29 8:18 ` [PATCH 01/67] x86: remove X86_PPRO_FENCE Christoph Hellwig
2017-12-29 8:18 ` [PATCH 02/67] alpha: mark jensen as broken Christoph Hellwig
2017-12-29 8:18 ` [PATCH 03/67] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2017-12-29 8:18 ` [PATCH 04/67] arm64: don't override dma_max_pfn Christoph Hellwig
2017-12-29 8:18 ` [PATCH 05/67] dma-mapping: replace PCI_DMA_BUS_IS_PHYS with a flag in struct dma_map_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 06/67] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2017-12-29 8:18 ` [PATCH 07/67] m32r: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 08/67] powerpc: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 09/67] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2017-12-29 8:18 ` [PATCH 10/67] m32r: remove the unused dma_capable helper Christoph Hellwig
2017-12-29 8:18 ` [PATCH 11/67] riscv: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 12/67] s390: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 13/67] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2017-12-29 8:18 ` [PATCH 14/67] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 15/67] hexagon: use the generic dma_capable helper Christoph Hellwig
2017-12-29 8:18 ` [PATCH 16/67] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2017-12-29 8:18 ` [PATCH 17/67] microblaze: rename dma_direct to dma_microblaze Christoph Hellwig
2017-12-29 10:11 ` Julian Calaby
2018-01-04 8:45 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 18/67] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2017-12-29 8:18 ` [PATCH 19/67] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 20/67] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 21/67] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
2017-12-29 8:18 ` [PATCH 22/67] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 23/67] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2017-12-29 8:18 ` [PATCH 24/67] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 25/67] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2017-12-29 8:18 ` [PATCH 26/67] dma-direct: use phys_to_dma Christoph Hellwig
2017-12-29 8:18 ` [PATCH 27/67] dma-direct: add dma address sanity checks Christoph Hellwig
2017-12-29 8:18 ` [PATCH 28/67] dma-direct: add support for CMA allocation Christoph Hellwig
2017-12-29 8:18 ` [PATCH 29/67] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2017-12-29 8:18 ` [PATCH 30/67] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2017-12-29 8:18 ` [PATCH 31/67] dma-direct: make dma_direct_{alloc,free} available to other implementations Christoph Hellwig
2017-12-29 8:18 ` [PATCH 32/67] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2017-12-29 8:18 ` [PATCH 33/67] dma-direct: reject too small dma masks Christoph Hellwig
2017-12-29 8:18 ` [PATCH 34/67] cris: use dma-direct Christoph Hellwig
2017-12-29 8:18 ` [PATCH 35/67] h8300: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 36/67] x86: remove dma_alloc_coherent_mask Christoph Hellwig
2017-12-29 8:18 ` [PATCH 37/67] x86: use dma-direct Christoph Hellwig
2017-12-29 8:18 ` [PATCH 38/67] x86/amd_gart: clean up gart_alloc_coherent Christoph Hellwig
2017-12-29 8:18 ` [PATCH 39/67] iommu/amd_iommu: use dma_direct_* helpers for the direct mapping case Christoph Hellwig
2017-12-29 8:18 ` [PATCH 40/67] iommu/intel-iommu: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 41/67] x86: remove dma_alloc_coherent_gfp_flags Christoph Hellwig
2017-12-29 8:18 ` [PATCH 42/67] arm64: rename swiotlb_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 43/67] ia64: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 44/67] powerpc: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 45/67] swiotlb: rename swiotlb_free to swiotlb_exit Christoph Hellwig
2017-12-29 8:18 ` [PATCH 46/67] swiotlb: lift x86 swiotlb_dma_ops to common code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 47/67] swiotlb: wire up ->dma_supported in swiotlb_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 48/67] swiotlb: rely on dev->coherent_dma_mask Christoph Hellwig
2017-12-29 8:18 ` [PATCH 49/67] swiotlb: refactor coherent buffer freeing Christoph Hellwig
2017-12-29 8:18 ` [PATCH 50/67] swiotlb: refactor coherent buffer allocation Christoph Hellwig
2017-12-29 8:18 ` [PATCH 51/67] set_memory.h: provide set_memory_{en,de}crypted stubs Christoph Hellwig
2017-12-29 8:18 ` [PATCH 52/67] dma-direct: handle the memory encryption bit in common code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 53/67] swiotlb: remove swiotlb_set_mem_attributes Christoph Hellwig
2017-12-29 8:18 ` [PATCH 54/67] x86: remove sta2x11_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 55/67] ia64: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 56/67] ia64: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` Christoph Hellwig [this message]
2017-12-29 8:19 ` [PATCH 58/67] ia64: remove an ifdef around the content of pci-dma.c Christoph Hellwig
2017-12-29 8:19 ` [PATCH 59/67] unicore32: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` [PATCH 60/67] tile: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 61/67] tile: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` [PATCH 62/67] mips/netlogic: remove swiotlb support Christoph Hellwig
2017-12-29 8:19 ` [PATCH 63/67] mips: use swiotlb_{alloc,free} Christoph Hellwig
2017-12-29 8:19 ` [PATCH 64/67] arm64: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 65/67] arm64: use swiotlb_alloc and swiotlb_free Christoph Hellwig
2017-12-29 8:19 ` [PATCH 66/67] swiotlb: remove swiotlb_{alloc,free}_coherent Christoph Hellwig
2017-12-29 8:19 ` [PATCH 67/67] swiotlb: remove various exports Christoph Hellwig
2017-12-29 10:52 ` consolidate direct dma mapping and swiotlb support Vladimir Murzin
2017-12-30 10:56 ` Christoph Hellwig
[not found] ` <20171229081911.2802-28-hch@lst.de>
2017-12-29 14:12 ` [PATCH 27/67] dma-direct: add dma address sanity checks Geert Uytterhoeven
[not found] ` <CAMuHMdWg3PnTXezMCcr3oGf-83-cjvcj4wGiPk7j2pY1Tgzo9Q@mail.gmail.com>
2018-01-04 8:52 ` Christoph Hellwig
[not found] ` <20171229081911.2802-17-hch@lst.de>
2018-01-02 9:45 ` [PATCH 16/67] powerpc: rename dma_direct_ to dma_nommu_ Michael Ellerman
[not found] ` <878tdgtwzp.fsf@concordia.ellerman.id.au>
2018-01-02 10:22 ` Geert Uytterhoeven
[not found] ` <CAMuHMdWWus2kNSOzS94k-3678826W1YjKwCWTquu3hBLZ80cvw@mail.gmail.com>
2018-01-03 6:24 ` Michael Ellerman
2018-01-03 7:49 ` Geert Uytterhoeven
[not found] ` <CAMuHMdWYDz_jHNxQ-B8944520R-myzHkjkL1rKWUjA38inU7cw@mail.gmail.com>
2018-01-03 8:19 ` Julian Calaby
2018-01-04 8:48 ` Christoph Hellwig
2018-01-04 8:49 ` Christoph Hellwig
[not found] ` <20180104084930.GB3251@lst.de>
2018-01-09 15:38 ` Christoph Hellwig
[not found] ` <20171229081911.2802-30-hch@lst.de>
2018-01-02 10:29 ` [PATCH 29/67] dma-direct: use node local allocations for coherent memory Geert Uytterhoeven
[not found] ` <20171229081911.2802-3-hch@lst.de>
2018-01-02 10:36 ` [PATCH 02/67] alpha: mark jensen as broken Geert Uytterhoeven
2018-01-04 8:53 ` Christoph Hellwig
[not found] ` <20171229081911.2802-26-hch@lst.de>
2018-01-02 16:25 ` [PATCH 25/67] dma-direct: rename dma_noop to dma_direct Vladimir Murzin
[not found] ` <20171229081911.2802-27-hch@lst.de>
2018-01-02 16:26 ` [PATCH 26/67] dma-direct: use phys_to_dma Vladimir Murzin
[not found] ` <20171229081911.2802-31-hch@lst.de>
2018-01-02 16:43 ` [PATCH 30/67] dma-direct: retry allocations using GFP_DMA for small masks Vladimir Murzin
2018-01-04 9:02 ` Christoph Hellwig
[not found] ` <20171229081911.2802-32-hch@lst.de>
2018-01-02 16:44 ` [PATCH 31/67] dma-direct: make dma_direct_{alloc, free} available to other implementations Vladimir Murzin
[not found] ` <20171229081911.2802-10-hch@lst.de>
2018-01-05 19:45 ` [PATCH 09/67] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Vineet Gupta
[not found] ` <20171229081911.2802-7-hch@lst.de>
2018-01-09 3:13 ` [PATCH 06/67] hexagon: remove unused flush_write_buffers definition Richard Kuo
[not found] ` <20171229081911.2802-35-hch@lst.de>
2018-01-09 15:53 ` [PATCH 34/67] cris: use dma-direct Jesper Nilsson
[not found] ` <20171229081911.2802-23-hch@lst.de>
2018-01-02 10:38 ` [PATCH 22/67] dma-mapping: clear harmful GFP_* flags in common code Geert Uytterhoeven
2018-01-09 15:54 ` Jesper Nilsson
[not found] ` <20171229081911.2802-6-hch@lst.de>
2018-01-02 10:39 ` [PATCH 05/67] dma-mapping: replace PCI_DMA_BUS_IS_PHYS with a flag in struct dma_map_ops Geert Uytterhoeven
2018-01-09 15:55 ` Jesper Nilsson
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='20171229081911.2802-58-hch__37599.307325627$1514535925$gmane$org@lst.de' \
--to=hch@lst.de \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=gxt@mprc.pku.edu.cn \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=patches@groups.riscv.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.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).