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 62/67] mips/netlogic: remove swiotlb support
Date: Fri, 29 Dec 2017 09:19:06 +0100 [thread overview]
Message-ID: <20171229081911.2802-63-hch@lst.de> (raw)
In-Reply-To: <20171229081911.2802-1-hch@lst.de>
nlm_swiotlb_dma_ops is unused code, so the whole swiotlb support is dead.
If it gets resurrected at some point it should use the generic
swiotlb_dma_ops instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/mips/include/asm/netlogic/common.h | 3 --
arch/mips/netlogic/Kconfig | 5 --
arch/mips/netlogic/common/Makefile | 1 -
arch/mips/netlogic/common/nlm-dma.c | 94 ---------------------------------
4 files changed, 103 deletions(-)
delete mode 100644 arch/mips/netlogic/common/nlm-dma.c
diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h
index a6e6cbebe046..57616649b4f3 100644
--- a/arch/mips/include/asm/netlogic/common.h
+++ b/arch/mips/include/asm/netlogic/common.h
@@ -87,9 +87,6 @@ unsigned int nlm_get_cpu_frequency(void);
extern const struct plat_smp_ops nlm_smp_ops;
extern char nlm_reset_entry[], nlm_reset_entry_end[];
-/* SWIOTLB */
-extern const struct dma_map_ops nlm_swiotlb_dma_ops;
-
extern unsigned int nlm_threads_per_core;
extern cpumask_t nlm_cpumask;
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 8296b13affd2..7fcfc7fe9f14 100644
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -89,9 +89,4 @@ config IOMMU_HELPER
config NEED_SG_DMA_LENGTH
bool
-config SWIOTLB
- def_bool y
- select NEED_SG_DMA_LENGTH
- select IOMMU_HELPER
-
endif
diff --git a/arch/mips/netlogic/common/Makefile b/arch/mips/netlogic/common/Makefile
index 60d00b5d748e..89f6e3f39fed 100644
--- a/arch/mips/netlogic/common/Makefile
+++ b/arch/mips/netlogic/common/Makefile
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += irq.o time.o
-obj-y += nlm-dma.o
obj-y += reset.o
obj-$(CONFIG_SMP) += smp.o smpboot.o
obj-$(CONFIG_EARLY_PRINTK) += earlycons.o
diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c
deleted file mode 100644
index 49c975b6aa28..000000000000
--- a/arch/mips/netlogic/common/nlm-dma.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* Copyright (C) 2003-2013 Broadcom Corporation
-* All Rights Reserved
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the Broadcom
- * license below:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <linux/dma-mapping.h>
-#include <linux/scatterlist.h>
-#include <linux/bootmem.h>
-#include <linux/export.h>
-#include <linux/swiotlb.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-
-#include <asm/bootinfo.h>
-
-static char *nlm_swiotlb;
-
-static void *nlm_dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
-{
-#ifdef CONFIG_ZONE_DMA32
- if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
- gfp |= __GFP_DMA32;
-#endif
-
- /* Don't invoke OOM killer */
- gfp |= __GFP_NORETRY;
-
- return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
-}
-
-static void nlm_dma_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle, unsigned long attrs)
-{
- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
-}
-
-const struct dma_map_ops nlm_swiotlb_dma_ops = {
- .alloc = nlm_dma_alloc_coherent,
- .free = nlm_dma_free_coherent,
- .map_page = swiotlb_map_page,
- .unmap_page = swiotlb_unmap_page,
- .map_sg = swiotlb_map_sg_attrs,
- .unmap_sg = swiotlb_unmap_sg_attrs,
- .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
- .sync_single_for_device = swiotlb_sync_single_for_device,
- .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
- .sync_sg_for_device = swiotlb_sync_sg_for_device,
- .mapping_error = swiotlb_dma_mapping_error,
- .dma_supported = swiotlb_dma_supported
-};
-
-void __init plat_swiotlb_setup(void)
-{
- size_t swiotlbsize;
- unsigned long swiotlb_nslabs;
-
- swiotlbsize = 1 << 20; /* 1 MB for now */
- swiotlb_nslabs = swiotlbsize >> IO_TLB_SHIFT;
- swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE);
- swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT;
-
- nlm_swiotlb = alloc_bootmem_low_pages(swiotlbsize);
- swiotlb_init_with_tbl(nlm_swiotlb, swiotlb_nslabs, 1);
-}
--
2.14.2
next prev parent reply other threads:[~2017-12-29 8:24 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 8:18 consolidate direct dma mapping and swiotlb support Christoph Hellwig
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
2018-01-02 10:36 ` Geert Uytterhoeven
2018-01-04 8:53 ` 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
2018-01-02 10:39 ` Geert Uytterhoeven
2018-01-09 15:55 ` Jesper Nilsson
2017-12-29 8:18 ` [PATCH 06/67] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-09 3:13 ` Richard Kuo
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
2018-01-05 19:45 ` Vineet Gupta
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
2018-01-02 9:45 ` Michael Ellerman
2018-01-02 10:22 ` Geert Uytterhoeven
2018-01-03 6:24 ` Michael Ellerman
2018-01-03 7:49 ` Geert Uytterhoeven
2018-01-03 8:19 ` Julian Calaby
2018-01-04 8:48 ` Christoph Hellwig
2018-01-04 8:49 ` Christoph Hellwig
2018-01-09 15:38 ` 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
2018-01-02 10:38 ` Geert Uytterhoeven
2018-01-09 15:54 ` Jesper Nilsson
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
2018-01-02 16:25 ` Vladimir Murzin
2017-12-29 8:18 ` [PATCH 26/67] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-02 16:26 ` Vladimir Murzin
2017-12-29 8:18 ` [PATCH 27/67] dma-direct: add dma address sanity checks Christoph Hellwig
2017-12-29 14:12 ` Geert Uytterhoeven
2018-01-04 8:52 ` 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
2018-01-02 10:29 ` Geert Uytterhoeven
2017-12-29 8:18 ` [PATCH 30/67] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-02 16:43 ` Vladimir Murzin
2018-01-04 9:02 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 31/67] dma-direct: make dma_direct_{alloc, free} available to other implementations Christoph Hellwig
2018-01-02 16:44 ` Vladimir Murzin
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
2018-01-09 15:53 ` Jesper Nilsson
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 ` [PATCH 57/67] ia64: clean up swiotlb support Christoph Hellwig
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 ` Christoph Hellwig [this message]
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
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-63-hch@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).