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

Commit 1c33b6b7 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

mips/netlogic: remove swiotlb support 



nlm_swiotlb_dma_ops is unused code, so the whole swiotlb support is dead.
If it gets resurrected at some point it should use the generic
swiotlb_dma_ops instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
parent b2b20695

arch/mips/include/asm/netlogic/common.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ unsigned int nlm_get_cpu_frequency(void); 
extern const struct plat_smp_ops nlm_smp_ops;

extern char nlm_reset_entry[], nlm_reset_entry_end[];



/* SWIOTLB */

extern const struct dma_map_ops nlm_swiotlb_dma_ops;



extern unsigned int nlm_threads_per_core;

extern cpumask_t nlm_cpumask;

arch/mips/netlogic/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -89,9 +89,4 @@ config IOMMU_HELPER 
config NEED_SG_DMA_LENGTH

	bool



config SWIOTLB

	def_bool y

	select NEED_SG_DMA_LENGTH

	select IOMMU_HELPER



endif

arch/mips/netlogic/common/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y				+= irq.o time.o

obj-y				+= nlm-dma.o

obj-y				+= reset.o

obj-$(CONFIG_SMP)		+= smp.o smpboot.o

obj-$(CONFIG_EARLY_PRINTK)	+= earlycons.o

arch/mips/netlogic/common/nlm-dma.c

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

*  Copyright (C) 2003-2013 Broadcom Corporation

*  All Rights Reserved

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the Broadcom

 * license below:

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR

 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#include <linux/dma-mapping.h>

#include <linux/scatterlist.h>

#include <linux/bootmem.h>

#include <linux/export.h>

#include <linux/swiotlb.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/mm.h>



#include <asm/bootinfo.h>



static char *nlm_swiotlb;



static void *nlm_dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

{

#ifdef CONFIG_ZONE_DMA32

	if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))

		gfp |= __GFP_DMA32;

#endif



	/* Don't invoke OOM killer */

	gfp |= __GFP_NORETRY;



	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);

}



static void nlm_dma_free_coherent(struct device *dev, size_t size,

	void *vaddr, dma_addr_t dma_handle, unsigned long attrs)

{

	swiotlb_free_coherent(dev, size, vaddr, dma_handle);

}



const struct dma_map_ops nlm_swiotlb_dma_ops = {

	.alloc = nlm_dma_alloc_coherent,

	.free = nlm_dma_free_coherent,

	.map_page = swiotlb_map_page,

	.unmap_page = swiotlb_unmap_page,

	.map_sg = swiotlb_map_sg_attrs,

	.unmap_sg = swiotlb_unmap_sg_attrs,

	.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,

	.dma_supported = swiotlb_dma_supported

};



void __init plat_swiotlb_setup(void)

{

	size_t swiotlbsize;

	unsigned long swiotlb_nslabs;



	swiotlbsize = 1 << 20; /* 1 MB for now */

	swiotlb_nslabs = swiotlbsize >> IO_TLB_SHIFT;

	swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE);

	swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT;



	nlm_swiotlb = alloc_bootmem_low_pages(swiotlbsize);

	swiotlb_init_with_tbl(nlm_swiotlb, swiotlb_nslabs, 1);

}