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

Commit 90f78162 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

unicore32: use generic swiotlb_ops



These are identical to the unicore32 ops, and would also support CMA
if enabled on unicore32.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
parent 35bd5071
Loading
Loading
Loading
Loading
+1 −8
Original line number Diff line number Diff line
@@ -12,18 +12,11 @@
#ifndef __UNICORE_DMA_MAPPING_H__
#define __UNICORE_DMA_MAPPING_H__

#ifdef __KERNEL__

#include <linux/mm_types.h>
#include <linux/scatterlist.h>
#include <linux/swiotlb.h>

extern const struct dma_map_ops swiotlb_dma_map_ops;

static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
	return &swiotlb_dma_map_ops;
	return &swiotlb_dma_ops;
}

#endif /* __KERNEL__ */
#endif
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ config CPU_TLB_SINGLE_ENTRY_DISABLE

config SWIOTLB
	def_bool y
	select DMA_DIRECT_OPS

config IOMMU_HELPER
	def_bool SWIOTLB
+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@
obj-y				:= extable.o fault.o init.o pgd.o mmu.o
obj-y				+= flush.o ioremap.o

obj-$(CONFIG_SWIOTLB)		+= dma-swiotlb.o

obj-$(CONFIG_MODULES)		+= proc-syms.o

obj-$(CONFIG_ALIGNMENT_TRAP)	+= alignment.o

arch/unicore32/mm/dma-swiotlb.c

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line
/*
 * Contains routines needed to support swiotlb for UniCore32.
 *
 * Copyright (C) 2010 Guan Xuetao
 *
 * This program is free software; you can redistribute  it and/or modify it
 * under  the terms of  the GNU General  Public License as published by the
 * Free Software Foundation;  either version 2 of the  License, or (at your
 * option) any later version.
 */
#include <linux/pci.h>
#include <linux/cache.h>
#include <linux/module.h>
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
#include <linux/bootmem.h>

#include <asm/dma.h>

static void *unicore_swiotlb_alloc_coherent(struct device *dev, size_t size,
					    dma_addr_t *dma_handle, gfp_t flags,
					    unsigned long attrs)
{
	return swiotlb_alloc_coherent(dev, size, dma_handle, flags);
}

static void unicore_swiotlb_free_coherent(struct device *dev, size_t size,
					  void *vaddr, dma_addr_t dma_addr,
					  unsigned long attrs)
{
	swiotlb_free_coherent(dev, size, vaddr, dma_addr);
}

const struct dma_map_ops swiotlb_dma_map_ops = {
	.alloc = unicore_swiotlb_alloc_coherent,
	.free = unicore_swiotlb_free_coherent,
	.map_sg = swiotlb_map_sg_attrs,
	.unmap_sg = swiotlb_unmap_sg_attrs,
	.dma_supported = swiotlb_dma_supported,
	.map_page = swiotlb_map_page,
	.unmap_page = swiotlb_unmap_page,
	.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,
};
EXPORT_SYMBOL(swiotlb_dma_map_ops);