Commit 68005b67 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/dma: use the generic direct mapping bypass 



Now that we've switched all the powerpc nommu and swiotlb methods to
use the generic dma_direct_* calls we can remove these ops vectors
entirely and rely on the common direct mapping bypass that avoids
indirect function calls entirely.  This also allows to remove a whole
lot of boilerplate code related to setting up these operations.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 461db2bd

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

+0 −9
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
#include <asm/io.h>

#include <asm/swiotlb.h>



/* Some dma direct funcs must be visible for use in other dma_ops */

extern void *__dma_nommu_alloc_coherent(struct device *dev, size_t size,

					 dma_addr_t *dma_handle, gfp_t flag,

					 unsigned long attrs);

extern void __dma_nommu_free_coherent(struct device *dev, size_t size,

				       void *vaddr, dma_addr_t dma_handle,

				       unsigned long attrs);



static inline unsigned long device_to_mask(struct device *dev)

{

	if (dev->dma_mask && *dev->dma_mask)
@@ -40,7 +32,6 @@ static inline unsigned long device_to_mask(struct device *dev) 
#ifdef CONFIG_PPC64

extern const struct dma_map_ops dma_iommu_ops;

#endif

extern const struct dma_map_ops dma_nommu_ops;



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

{

arch/powerpc/include/asm/swiotlb.h

+0 −3
Original line number Diff line number Diff line
@@ -13,10 +13,7 @@ 


#include <linux/swiotlb.h>



extern const struct dma_map_ops powerpc_swiotlb_dma_ops;



extern unsigned int ppc_swiotlb_enable;

int __init swiotlb_setup_bus_notifier(void);



#ifdef CONFIG_SWIOTLB

void swiotlb_detect_4g(void);

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ obj-y := cputable.o ptrace.o syscalls.o \ 
				   process.o systbl.o idle.o \

				   signal.o sysfs.o cacheinfo.o time.o \

				   prom.o traps.o setup-common.o \

				   udbg.o misc.o io.o dma.o misc_$(BITS).o \

				   udbg.o misc.o io.o misc_$(BITS).o \

				   of_platform.o prom_parse.o

obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \

				   signal_64.o ptrace32.o \

arch/powerpc/kernel/dma-swiotlb.c

+0 −58
Original line number Diff line number Diff line
@@ -10,70 +10,12 @@ 
 * option) any later version.

 *

 */



#include <linux/dma-direct.h>

#include <linux/memblock.h>

#include <linux/pfn.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/pci.h>



#include <asm/machdep.h>

#include <asm/swiotlb.h>

#include <asm/dma.h>



unsigned int ppc_swiotlb_enable;



/*

 * At the moment, all platforms that use this code only require

 * swiotlb to be used if we're operating on HIGHMEM.  Since

 * we don't ever call anything other than map_sg, unmap_sg,

 * map_page, and unmap_page on highmem, use normal dma_ops

 * for everything else.

 */

const struct dma_map_ops powerpc_swiotlb_dma_ops = {

	.alloc = dma_direct_alloc,

	.free = dma_direct_free,

	.map_sg = dma_direct_map_sg,

	.unmap_sg = dma_direct_unmap_sg,

	.dma_supported = dma_direct_supported,

	.map_page = dma_direct_map_page,

	.unmap_page = dma_direct_unmap_page,

	.sync_single_for_cpu = dma_direct_sync_single_for_cpu,

	.sync_single_for_device = dma_direct_sync_single_for_device,

	.sync_sg_for_cpu = dma_direct_sync_sg_for_cpu,

	.sync_sg_for_device = dma_direct_sync_sg_for_device,

	.get_required_mask = dma_direct_get_required_mask,

};



static int ppc_swiotlb_bus_notify(struct notifier_block *nb,

				  unsigned long action, void *data)

{

	struct device *dev = data;



	/* We are only intereted in device addition */

	if (action != BUS_NOTIFY_ADD_DEVICE)

		return 0;



	/* May need to bounce if the device can't address all of DRAM */

	if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM())

		set_dma_ops(dev, &powerpc_swiotlb_dma_ops);



	return NOTIFY_DONE;

}



static struct notifier_block ppc_swiotlb_plat_bus_notifier = {

	.notifier_call = ppc_swiotlb_bus_notify,

	.priority = 0,

};



int __init swiotlb_setup_bus_notifier(void)

{

	bus_register_notifier(&platform_bus_type,

			      &ppc_swiotlb_plat_bus_notifier);

	return 0;

}



void __init swiotlb_detect_4g(void)

{

	if ((memblock_end_of_DRAM() - 1) > 0xffffffff)

arch/powerpc/kernel/dma.c

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

 * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation

 *

 * Provide default implementations of the DMA mapping callbacks for

 * directly mapped busses.

 */



#include <linux/device.h>

#include <linux/dma-direct.h>

#include <linux/dma-debug.h>

#include <linux/gfp.h>

#include <linux/memblock.h>

#include <linux/export.h>

#include <linux/pci.h>

#include <asm/vio.h>

#include <asm/bug.h>

#include <asm/machdep.h>

#include <asm/swiotlb.h>

#include <asm/iommu.h>



/*

 * Generic direct DMA implementation

 *

 * This implementation supports a per-device offset that can be applied if

 * the address at which memory is visible to devices is not 0. Platform code

 * can set archdata.dma_data to an unsigned long holding the offset. By

 * default the offset is PCI_DRAM_OFFSET.

 */



const struct dma_map_ops dma_nommu_ops = {

#ifdef CONFIG_NOT_COHERENT_CACHE

	.alloc				= __dma_nommu_alloc_coherent,

	.free				= __dma_nommu_free_coherent,

#else

	.alloc				= dma_direct_alloc,

	.free				= dma_direct_free,

#endif

	.map_sg				= dma_direct_map_sg,

	.dma_supported			= dma_direct_supported,

	.map_page			= dma_direct_map_page,

	.get_required_mask		= dma_direct_get_required_mask,

#ifdef CONFIG_NOT_COHERENT_CACHE

	.unmap_sg			= dma_direct_unmap_sg,

	.unmap_page			= dma_direct_unmap_page,

	.sync_single_for_cpu 		= dma_direct_sync_single_for_cpu,

	.sync_single_for_device 	= dma_direct_sync_single_for_device,

	.sync_sg_for_cpu 		= dma_direct_sync_sg_for_cpu,

	.sync_sg_for_device 		= dma_direct_sync_sg_for_device,

#endif

};

EXPORT_SYMBOL(dma_nommu_ops);



static int __init dma_init(void)

{

#ifdef CONFIG_IBMVIO

	dma_debug_add_bus(&vio_bus_type);

#endif



       return 0;

}

fs_initcall(dma_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE