Commit 21890647 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers 



Commit 6ecba8eb (arm64: Use bus notifiers to set per-device coherent
DMA ops) introduced bus notifiers to set the coherent dma ops based on
the 'dma-coherent' DT property. Since the generic of_dma_configure()
handles this property for platform and AMBA devices, replace the
notifiers with set_arch_dma_coherent_ops().

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent c9d571be

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

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) 
	dev->archdata.dma_ops = ops;

}



static inline int set_arch_dma_coherent_ops(struct device *dev)

{

	set_dma_ops(dev, &coherent_swiotlb_dma_ops);

	return 0;

}

#define set_arch_dma_coherent_ops	set_arch_dma_coherent_ops



#include <asm-generic/dma-mapping-common.h>



static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

arch/arm64/mm/dma-mapping.c

+0 −31
Original line number Diff line number Diff line
@@ -22,11 +22,8 @@ 
#include <linux/slab.h>

#include <linux/dma-mapping.h>

#include <linux/dma-contiguous.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/vmalloc.h>

#include <linux/swiotlb.h>

#include <linux/amba/bus.h>



#include <asm/cacheflush.h>
@@ -308,40 +305,12 @@ struct dma_map_ops coherent_swiotlb_dma_ops = { 
};

EXPORT_SYMBOL(coherent_swiotlb_dma_ops);



static int dma_bus_notifier(struct notifier_block *nb,

			    unsigned long event, void *_dev)

{

	struct device *dev = _dev;



	if (event != BUS_NOTIFY_ADD_DEVICE)

		return NOTIFY_DONE;



	if (of_property_read_bool(dev->of_node, "dma-coherent"))

		set_dma_ops(dev, &coherent_swiotlb_dma_ops);



	return NOTIFY_OK;

}



static struct notifier_block platform_bus_nb = {

	.notifier_call = dma_bus_notifier,

};



static struct notifier_block amba_bus_nb = {

	.notifier_call = dma_bus_notifier,

};



extern int swiotlb_late_init_with_default_size(size_t default_size);



static int __init swiotlb_late_init(void)

{

	size_t swiotlb_size = min(SZ_64M, MAX_ORDER_NR_PAGES << PAGE_SHIFT);



	/*

	 * These must be registered before of_platform_populate().

	 */

	bus_register_notifier(&platform_bus_type, &platform_bus_nb);

	bus_register_notifier(&amba_bustype, &amba_bus_nb);



	dma_ops = &noncoherent_swiotlb_dma_ops;



	return swiotlb_late_init_with_default_size(swiotlb_size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE