arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers

Commit 6ecba8eb51b7 (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: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index dc82e52acdb35f406fd6ecbcaaeb405841400979..adeae3f6f0fc28402f36f1b4d58b98b16c69acf5 100644 (file)
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -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)

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 4164c5ace9f8f515c6e9ea16402b1cc18e16a432..d6ceb3df004736e21e5ac1170dceccdc677e2623 100644 (file)
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -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);