linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: Konrad Rzeszutek Wilk <konrad@darnok.org>,
	linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	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 33/34] cris: use dma-direct
Date: Fri, 12 Jan 2018 09:42:31 +0100	[thread overview]
Message-ID: <20180112084232.2857-34-hch@lst.de> (raw)
In-Reply-To: <20180112084232.2857-1-hch@lst.de>

cris currently has an incomplete direct mapping dma_map_ops implementation
if PCI support is enabled.  Replace it with the fully feature generic
dma-direct implementation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
---
 arch/cris/Kconfig                       |  4 ++
 arch/cris/arch-v32/drivers/pci/Makefile |  2 +-
 arch/cris/arch-v32/drivers/pci/dma.c    | 77 ---------------------------------
 arch/cris/include/asm/Kbuild            |  1 +
 arch/cris/include/asm/dma-mapping.h     | 20 ---------
 5 files changed, 6 insertions(+), 98 deletions(-)
 delete mode 100644 arch/cris/arch-v32/drivers/pci/dma.c
 delete mode 100644 arch/cris/include/asm/dma-mapping.h

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 54d3f426763b..cd5a0865c97f 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -33,6 +33,9 @@ config GENERIC_CALIBRATE_DELAY
 config NO_IOPORT_MAP
 	def_bool y if !PCI
 
+config NO_DMA
+	def_bool y if !PCI
+
 config FORCE_MAX_ZONEORDER
 	int
 	default 6
@@ -72,6 +75,7 @@ config CRIS
 	select GENERIC_SCHED_CLOCK if ETRAX_ARCH_V32
 	select HAVE_DEBUG_BUGVERBOSE if ETRAX_ARCH_V32
 	select HAVE_NMI
+	select DMA_DIRECT_OPS if PCI
 
 config HZ
 	int
diff --git a/arch/cris/arch-v32/drivers/pci/Makefile b/arch/cris/arch-v32/drivers/pci/Makefile
index bff7482f2444..93c8be6170b1 100644
--- a/arch/cris/arch-v32/drivers/pci/Makefile
+++ b/arch/cris/arch-v32/drivers/pci/Makefile
@@ -2,4 +2,4 @@
 # Makefile for Etrax cardbus driver
 #
 
-obj-$(CONFIG_ETRAX_CARDBUS)        += bios.o dma.o
+obj-$(CONFIG_ETRAX_CARDBUS)        += bios.o
diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c
deleted file mode 100644
index 8c3802244ef3..000000000000
--- a/arch/cris/arch-v32/drivers/pci/dma.c
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Dynamic DMA mapping support.
- *
- * On cris there is no hardware dynamic DMA address translation,
- * so consistent alloc/free are merely page allocation/freeing.
- * The rest of the dynamic DMA mapping interface is implemented
- * in asm/pci.h.
- *
- * Borrowed from i386.
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/gfp.h>
-#include <asm/io.h>
-
-static void *v32_dma_alloc(struct device *dev, size_t size,
-		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
-{
-	void *ret;
-
-	if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
-		gfp |= GFP_DMA;
-
-	ret = (void *)__get_free_pages(gfp,  get_order(size));
-
-	if (ret != NULL) {
-		memset(ret, 0, size);
-		*dma_handle = virt_to_phys(ret);
-	}
-	return ret;
-}
-
-static void v32_dma_free(struct device *dev, size_t size, void *vaddr,
-		dma_addr_t dma_handle, unsigned long attrs)
-{
-	free_pages((unsigned long)vaddr, get_order(size));
-}
-
-static inline dma_addr_t v32_dma_map_page(struct device *dev,
-		struct page *page, unsigned long offset, size_t size,
-		enum dma_data_direction direction, unsigned long attrs)
-{
-	return page_to_phys(page) + offset;
-}
-
-static inline int v32_dma_map_sg(struct device *dev, struct scatterlist *sg,
-		int nents, enum dma_data_direction direction,
-		unsigned long attrs)
-{
-	printk("Map sg\n");
-	return nents;
-}
-
-static inline int v32_dma_supported(struct device *dev, u64 mask)
-{
-        /*
-         * we fall back to GFP_DMA when the mask isn't all 1s,
-         * so we can't guarantee allocations that must be
-         * within a tighter range than GFP_DMA..
-         */
-        if (mask < 0x00ffffff)
-                return 0;
-	return 1;
-}
-
-const struct dma_map_ops v32_dma_ops = {
-	.alloc			= v32_dma_alloc,
-	.free			= v32_dma_free,
-	.map_page		= v32_dma_map_page,
-	.map_sg                 = v32_dma_map_sg,
-	.dma_supported		= v32_dma_supported,
-};
-EXPORT_SYMBOL(v32_dma_ops);
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 460349cb147f..8cf45ac30c1b 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -5,6 +5,7 @@ generic-y += cmpxchg.h
 generic-y += current.h
 generic-y += device.h
 generic-y += div64.h
+generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += extable.h
diff --git a/arch/cris/include/asm/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h
deleted file mode 100644
index 1553bdb30a0c..000000000000
--- a/arch/cris/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_CRIS_DMA_MAPPING_H
-#define _ASM_CRIS_DMA_MAPPING_H
-
-#ifdef CONFIG_PCI
-extern const struct dma_map_ops v32_dma_ops;
-
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-	return &v32_dma_ops;
-}
-#else
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-	BUG();
-	return NULL;
-}
-#endif
-
-#endif
-- 
2.14.2


  parent reply	other threads:[~2018-01-12  8:42 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-12  8:41 consolidate direct dma mapping V4 Christoph Hellwig
2018-01-12  8:41 ` Christoph Hellwig
2018-01-12  8:41 ` [PATCH 01/34] alpha: mark jensen as broken Christoph Hellwig
2018-01-12  8:41   ` Christoph Hellwig
     [not found] ` <20180112084232.2857-1-hch-jcswGhMUV9g@public.gmane.org>
2018-01-12  8:42   ` [PATCH 02/34] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 03/34] m32r: " Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 04/34] powerpc: " Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 05/34] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 06/34] m32r: remove the unused dma_capable helper Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 07/34] riscv: " Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 08/34] s390: " Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 09/34] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 13/34] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 16/34] microblaze: rename dma_direct to dma_nommu Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 20/34] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 22/34] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-02-02 17:47     ` Randy Dunlap
2018-02-02 17:47       ` Randy Dunlap
2018-01-12  8:42   ` [PATCH 23/34] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 25/34] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-12  8:42   ` [PATCH 26/34] dma-direct: add dma address sanity checks Christoph Hellwig
2018-01-12  8:42     ` Christoph Hellwig
2018-01-16  7:52   ` consolidate direct dma mapping V4 Christoph Hellwig
2018-01-16  7:52     ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 10/34] arm64: don't override dma_max_pfn Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 11/34] mips: fix an off-by-one in dma_capable Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 12/34] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 14/34] hexagon: use the generic dma_capable helper Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 15/34] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 17/34] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 18/34] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 19/34] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 21/34] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 24/34] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-12  8:42 ` [PATCH 27/34] dma-direct: add support for CMA allocation Christoph Hellwig
2018-01-12  8:42 ` [PATCH 28/34] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-12  8:42 ` [PATCH 29/34] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 30/34] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 31/34] dma-direct: make dma_direct_{alloc,free} available to other implementations Christoph Hellwig
2018-01-12  8:42   ` Christoph Hellwig
2018-01-12  8:42 ` [PATCH 32/34] dma-direct: reject too small dma masks Christoph Hellwig
2018-01-12  8:42 ` Christoph Hellwig [this message]
2018-01-12  8:42   ` [PATCH 33/34] cris: use dma-direct Christoph Hellwig
2018-01-12  8:42 ` [PATCH 34/34] h8300: " Christoph Hellwig
2018-01-12  8:42   ` 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=20180112084232.2857-34-hch@lst.de \
    --to=hch@lst.de \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=iommu@lists.linux-foundation.org \
    --cc=konrad@darnok.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).