Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f73337f4 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

cris: use dma-direct 



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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 1a9777a8

arch/cris/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/cris/arch-v32/drivers/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Makefile for Etrax cardbus driver

#



obj-$(CONFIG_ETRAX_CARDBUS)        += bios.o dma.o
 
obj-$(CONFIG_ETRAX_CARDBUS)        += bios.o

arch/cris/arch-v32/drivers/pci/dma.c

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
// 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);

arch/cris/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/cris/include/asm/dma-mapping.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* 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