powerpc: implement arch_setup_pdev_archdata

We have a long standing issues with platform devices not have a valid
dma_mask pointer.  This hasn't been an issue to date as no platform
device has tried to set its dma_mask value to a non-default value.

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index e053b1641de383c156625db3cc968ec76a766eee..c600faf114d7728b75255139b9cbc4c08c8e935f 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -709,29 +709,9 @@ void ppc_printk_progress(char *s, unsigned short hex)
        pr_info("%s\n", s);
 }
 
-static int ppc_dflt_bus_notify(struct notifier_block *nb,
-                               unsigned long action, void *data)
+void arch_setup_pdev_archdata(struct platform_device *pdev)
 {
-       struct device *dev = data;
-
-       /* We are only intereted in device addition */
-       if (action != BUS_NOTIFY_ADD_DEVICE)
-               return 0;
-
-       set_dma_ops(dev, &dma_direct_ops);
-
-       return NOTIFY_DONE;
-}
-
-static struct notifier_block ppc_dflt_plat_bus_notifier = {
-       .notifier_call = ppc_dflt_bus_notify,
-       .priority = INT_MAX,
-};
-
-static int __init setup_bus_notifier(void)
-{
-       bus_register_notifier(&platform_bus_type, &ppc_dflt_plat_bus_notifier);
-       return 0;
+       pdev->archdata.dma_mask = DMA_BIT_MASK(32);
+       pdev->dev.dma_mask = &pdev->archdata.dma_mask;
+       set_dma_ops(&pdev->dev, &dma_direct_ops);
 }
-
-arch_initcall(setup_bus_notifier);

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 63d3cb73bdb9ac31b46efa252d0075e5c6c16c0a..cfc6a7969401c15ffab2a5eee44048d7702f9c2e 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -153,7 +153,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
        }
 
        dev->dev.of_node = of_node_get(np);
-#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
+#if defined(CONFIG_MICROBLAZE)
        dev->dev.dma_mask = &dev->archdata.dma_mask;
 #endif
        dev->dev.parent = parent;
@@ -189,7 +189,7 @@ struct platform_device *of_platform_device_create(struct device_node *np,
        if (!dev)
                return NULL;
 
-#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
+#if defined(CONFIG_MICROBLAZE)
        dev->archdata.dma_mask = 0xffffffffUL;
 #endif
        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);