powerpc: dart_iommu: optionally populate controller_ops on init

If a pci_controller_ops struct is provided to iommu_init_early_dart,
populate that with the DMA setup ops, rather than ppc_md. If NULL is
provided, populate ppc_md as before.

This also patches the call sites for Maple and Power Mac to pass
NULL, so existing behaviour is preserved.

The benefit of making this optional is that it means we don't have
to change dart, Maple and Power Mac over to the controller_ops
system in one fell swoop.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
index f1ea5972f6eccddceb7b776961ff67dcf2cb14e6..0be7d9e131894678653e6358f7bb961fa9ce1040 100644 (file)
--- a/arch/powerpc/include/asm/iommu.h
+++ b/arch/powerpc/include/asm/iommu.h
@@ -29,6 +29,7 @@
 #include <linux/bitops.h>
 #include <asm/machdep.h>
 #include <asm/types.h>
+#include <asm/pci-bridge.h>
 
 #define IOMMU_PAGE_SHIFT_4K      12
 #define IOMMU_PAGE_SIZE_4K       (ASM_CONST(1) << IOMMU_PAGE_SHIFT_4K)
@@ -169,7 +170,7 @@ extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle,
                             struct dma_attrs *attrs);
 
 extern void iommu_init_early_pSeries(void);
-extern void iommu_init_early_dart(void);
+extern void iommu_init_early_dart(struct pci_controller_ops *controller_ops);
 extern void iommu_init_early_pasemi(void);
 
 extern void alloc_dart_table(void);

diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 56b85cd61aaf23eb8b96265b3fd74422e3910722..3bf2e0359d5e7645909b94f3c6899303dcd8b716 100644 (file)
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -203,7 +203,7 @@ static void __init maple_init_early(void)
 {
        DBG(" -> maple_init_early\n");
 
-       iommu_init_early_dart();
+       iommu_init_early_dart(NULL);
 
        DBG(" <- maple_init_early\n");
 }

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index efe172db5f8ec479b10ac5bc981b8232bc0a5fc3..71a353c07d0c7cfe2d2e439b093f7c4db5745ba5 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -473,7 +473,7 @@ static void __init pmac_init_early(void)
        udbg_adb_init(!!strstr(boot_command_line, "btextdbg"));
 
 #ifdef CONFIG_PPC64
-       iommu_init_early_dart();
+       iommu_init_early_dart(NULL);
 #endif
 
        /* SMP Init has to be done early as we need to patch up

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 9e5353ff6d1bb936fb1b84af74d8f2e6a1dd6da2..120e96a9e2cb065cc3cb5eacfeb3249deb1b8cfe 100644 (file)
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -369,7 +369,7 @@ static int dart_dma_set_mask(struct device *dev, u64 dma_mask)
        return 0;
 }
 
-void __init iommu_init_early_dart(void)
+void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops)
 {
        struct device_node *dn;
 
@@ -395,15 +395,23 @@ void __init iommu_init_early_dart(void)
        if (dart_is_u4)
                ppc_md.dma_set_mask = dart_dma_set_mask;
 
-       ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
-       ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
-
+       if (controller_ops) {
+               controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
+               controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
+       } else {
+               ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
+               ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
+       }
        /* Setup pci_dma ops */
        set_pci_dma_ops(&dma_iommu_ops);
        return;
 
  bail:
        /* If init failed, use direct iommu and null setup functions */
+       if (controller_ops) {
+               controller_ops->dma_dev_setup = NULL;
+               controller_ops->dma_bus_setup = NULL;
+       }
        ppc_md.pci_dma_dev_setup = NULL;
        ppc_md.pci_dma_bus_setup = NULL;