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

Unverified Commit c5e2bbb4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Burton
Browse files

MIPS: jazz: split dma mapping operations from dma-default 



Jazz actually has a very basic IOMMU, so split the ops into a separate
implementation from the generic default support (which is about to go
away anyway).

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Patchwork: https://patchwork.linux-mips.org/patch/19548/


Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
parent d1f2564a

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

+4 −1
Original line number Diff line number Diff line
@@ -10,12 +10,15 @@ 
#include <dma-coherence.h>

#endif



extern const struct dma_map_ops jazz_dma_ops;

extern const struct dma_map_ops mips_default_dma_map_ops;

extern const struct dma_map_ops mips_swiotlb_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

#ifdef CONFIG_SWIOTLB

#if defined(CONFIG_MACH_JAZZ)

	return &jazz_dma_ops;

#elif defined(CONFIG_SWIOTLB)

	return &mips_swiotlb_ops;

#elif defined(CONFIG_MIPS_DMA_DEFAULT)

	return &mips_default_dma_map_ops;

arch/mips/include/asm/mach-jazz/dma-coherence.h

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2006  Ralf Baechle <ralf@linux-mips.org>

 */

#ifndef __ASM_MACH_JAZZ_DMA_COHERENCE_H

#define __ASM_MACH_JAZZ_DMA_COHERENCE_H



#include <asm/jazzdma.h>



struct device;



static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)

{

	return vdma_alloc(virt_to_phys(addr), size);

}



static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,

	struct page *page)

{

	return vdma_alloc(page_to_phys(page), PAGE_SIZE);

}



static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	return vdma_log2phys(dma_addr);

}



static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,

	size_t size, enum dma_data_direction direction)

{

	vdma_free(dma_addr);

}



static inline int plat_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 < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_post_dma_flush(struct device *dev)

{

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 0;

}



#endif /* __ASM_MACH_JAZZ_DMA_COHERENCE_H */

arch/mips/jazz/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config ACER_PICA_61 
	bool "Support for Acer PICA 1 chipset"

	depends on MACH_JAZZ

	select DMA_NONCOHERENT

	select MIPS_DMA_DEFAULT

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
@@ -15,7 +14,6 @@ config MIPS_MAGNUM_4000 
	bool "Support for MIPS Magnum 4000"

	depends on MACH_JAZZ

	select DMA_NONCOHERENT

	select MIPS_DMA_DEFAULT

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help
@@ -28,7 +26,6 @@ config OLIVETTI_M700 
	bool "Support for Olivetti M700-10"

	depends on MACH_JAZZ

	select DMA_NONCOHERENT

	select MIPS_DMA_DEFAULT

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This is a machine with a R4000 100 MHz CPU. To compile a Linux

arch/mips/jazz/jazzdma.c

+140 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/bootmem.h>

#include <linux/spinlock.h>

#include <linux/gfp.h>

#include <linux/dma-direct.h>

#include <linux/dma-noncoherent.h>

#include <asm/mipsregs.h>

#include <asm/jazz.h>

#include <asm/io.h>
@@ -86,6 +88,7 @@ static int __init vdma_init(void) 
	printk(KERN_INFO "VDMA: R4030 DMA pagetables initialized.\n");

	return 0;

}

arch_initcall(vdma_init);



/*

 * Allocate DMA pagetables using a simple first-fit algorithm
@@ -556,4 +559,140 @@ int vdma_get_enable(int channel) 
	return enable;

}



arch_initcall(vdma_init);
 
static void *jazz_dma_alloc(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

{

	void *ret;



	ret = dma_direct_alloc(dev, size, dma_handle, gfp, attrs);

	if (!ret)

		return NULL;



	*dma_handle = vdma_alloc(virt_to_phys(ret), size);

	if (*dma_handle == VDMA_ERROR) {

		dma_direct_free(dev, size, ret, *dma_handle, attrs);

		return NULL;

	}



	if (!(attrs & DMA_ATTR_NON_CONSISTENT)) {

		dma_cache_wback_inv((unsigned long)ret, size);

		ret = UNCAC_ADDR(ret);

	}

	return ret;

}



static void jazz_dma_free(struct device *dev, size_t size, void *vaddr,

		dma_addr_t dma_handle, unsigned long attrs)

{

	vdma_free(dma_handle);

	if (!(attrs & DMA_ATTR_NON_CONSISTENT))

		vaddr = (void *)CAC_ADDR((unsigned long)vaddr);

	return dma_direct_free(dev, size, vaddr, dma_handle, attrs);

}



static dma_addr_t jazz_dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, enum dma_data_direction dir,

		unsigned long attrs)

{

	phys_addr_t phys = page_to_phys(page) + offset;



	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		arch_sync_dma_for_device(dev, phys, size, dir);

	return vdma_alloc(phys, size);

}



static void jazz_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,

		size_t size, enum dma_data_direction dir, unsigned long attrs)

{

	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		arch_sync_dma_for_cpu(dev, vdma_log2phys(dma_addr), size, dir);

	vdma_free(dma_addr);

}



static int jazz_dma_map_sg(struct device *dev, struct scatterlist *sglist,

		int nents, enum dma_data_direction dir, unsigned long attrs)

{

	int i;

	struct scatterlist *sg;



	for_each_sg(sglist, sg, nents, i) {

		if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

			arch_sync_dma_for_device(dev, sg_phys(sg), sg->length,

				dir);

		sg->dma_address = vdma_alloc(sg_phys(sg), sg->length);

		if (sg->dma_address == VDMA_ERROR)

			return 0;

		sg_dma_len(sg) = sg->length;

	}



	return nents;

}



static void jazz_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,

		int nents, enum dma_data_direction dir, unsigned long attrs)

{

	int i;

	struct scatterlist *sg;



	for_each_sg(sglist, sg, nents, i) {

		if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

			arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length,

				dir);

		vdma_free(sg->dma_address);

	}

}



static void jazz_dma_sync_single_for_device(struct device *dev,

		dma_addr_t addr, size_t size, enum dma_data_direction dir)

{

	arch_sync_dma_for_device(dev, vdma_log2phys(addr), size, dir);

}



static void jazz_dma_sync_single_for_cpu(struct device *dev,

		dma_addr_t addr, size_t size, enum dma_data_direction dir)

{

	arch_sync_dma_for_cpu(dev, vdma_log2phys(addr), size, dir);

}



static void jazz_dma_sync_sg_for_device(struct device *dev,

		struct scatterlist *sgl, int nents, enum dma_data_direction dir)

{

	struct scatterlist *sg;

	int i;



	for_each_sg(sgl, sg, nents, i)

		arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir);

}



static void jazz_dma_sync_sg_for_cpu(struct device *dev,

		struct scatterlist *sgl, int nents, enum dma_data_direction dir)

{

	struct scatterlist *sg;

	int i;



	for_each_sg(sgl, sg, nents, i)

		arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir);

}



static int jazz_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr == VDMA_ERROR;

}



const struct dma_map_ops jazz_dma_ops = {

	.alloc			= jazz_dma_alloc,

	.free			= jazz_dma_free,

	.mmap			= arch_dma_mmap,

	.map_page		= jazz_dma_map_page,

	.unmap_page		= jazz_dma_unmap_page,

	.map_sg			= jazz_dma_map_sg,

	.unmap_sg		= jazz_dma_unmap_sg,

	.sync_single_for_cpu	= jazz_dma_sync_single_for_cpu,

	.sync_single_for_device	= jazz_dma_sync_single_for_device,

	.sync_sg_for_cpu	= jazz_dma_sync_sg_for_cpu,

	.sync_sg_for_device	= jazz_dma_sync_sg_for_device,

	.dma_supported		= dma_direct_supported,

	.cache_sync		= arch_dma_cache_sync,

	.mapping_error		= jazz_dma_mapping_error,

};

EXPORT_SYMBOL(jazz_dma_ops);