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

unicore32: remove swiotlb support 



unicore32 is a bog standard 32-bit port without larger physical address
space, highmem or any other obvious addressing limitation.  There should
be no need to bounce buffer using swiotlb.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarGuan Xuetao <gxt@pku.edu.cn>
parent 1a0afc14

arch/unicore32/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config UNICORE32 
	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select DMA_DIRECT_OPS

	select HAVE_MEMBLOCK

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP
@@ -20,7 +21,6 @@ config UNICORE32 
	select GENERIC_IOMAP

	select MODULES_USE_ELF_REL

	select NEED_DMA_MAP_STATE

	select SWIOTLB

	help

	  UniCore-32 is 32-bit Instruction Set Architecture,

	  including a series of low-power-consumption RISC chip

arch/unicore32/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ generic-y += compat.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/unicore32/include/asm/dma-mapping.h

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

 * linux/arch/unicore32/include/asm/dma-mapping.h

 *

 * Code specific to PKUnity SoC and UniCore ISA

 *

 * Copyright (C) 2001-2010 GUAN Xue-tao

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __UNICORE_DMA_MAPPING_H__

#define __UNICORE_DMA_MAPPING_H__



#include <linux/swiotlb.h>



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

{

	return &swiotlb_dma_ops;

}



#endif

arch/unicore32/mm/init.c

+0 −3
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ void __init bootmem_init(void) 


	uc32_bootmem_init(min, max_low);



#ifdef CONFIG_SWIOTLB

	swiotlb_init(1);

#endif

	/*

	 * Sparsemem tries to allocate bootmem in memory_present(),

	 * so must be done after the fixed reservations