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>

1 files changed, 12 insertions, 4 deletions

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 9e5353ff6d1b..120e96a9e2cb 100644
--- 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;