]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
powerpc: dart_iommu: optionally populate controller_ops on init
authorDaniel Axtens <dja@axtens.net>
Tue, 31 Mar 2015 05:00:48 +0000 (16:00 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 11 Apr 2015 10:49:14 +0000 (20:49 +1000)
commit798248a3c083a4cf0ead44a85e66c6a18647abea
tree88a0971d56d65ff2b5a4e2d93a696926f2dd182f
parentcd16c7ba0cc21aa1563e4b8430519b6488d0de60
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>
arch/powerpc/include/asm/iommu.h
arch/powerpc/platforms/maple/setup.c
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/sysdev/dart_iommu.c