kernel/arch/powerpc/include/asm/dma-mapping.h, branch linux-5.2.y

powerpc/dma: trim the fat from

2019-02-18T11:41:04Z

There is no need to provide anything but get_arch_dma_ops to . More the remaining declarations to and drop all the includes. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: remove set_dma_offset

2019-02-18T11:41:04Z

There is no good reason for this helper, just opencode it. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: remove get_dma_offset

2019-02-18T11:41:04Z

Just fold the calculation into __phys_to_dma/__dma_to_phys as those are the only places that should know about it. Signed-off-by: Christoph Hellwig Acked-by: Benjamin Herrenschmidt Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: use the generic direct mapping bypass

2019-02-18T11:41:04Z

Now that we've switched all the powerpc nommu and swiotlb methods to use the generic dma_direct_* calls we can remove these ops vectors entirely and rely on the common direct mapping bypass that avoids indirect function calls entirely. This also allows to remove a whole lot of boilerplate code related to setting up these operations. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: use the dma_direct mapping routines

2019-02-18T11:41:04Z

Switch the streaming DMA mapping and ownership transfer methods to the functionally identical dma_direct_ versions. Factor the cache maintainance helpers into the form expected by the common code for that. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: remove dma_nommu_dma_supported

2019-02-18T11:41:04Z

This function is largely identical to the generic version used everywhere else. Replace it with the generic version. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: remove dma_nommu_get_required_mask

2019-02-18T11:41:04Z

This function is identical to the generic dma_direct_get_required_mask, except that the generic version also takes the bus_dma_mask account, which could lead to incorrect results in the powerpc version. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: remove dma_nommu_mmap_coherent

2019-02-18T11:41:03Z

The coherent cache version of this function already is functionally identicall to the default version, and by defining the arch_dma_coherent_to_pfn hook the same is ture for the noncoherent version as well. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

dma-mapping, powerpc: simplify the arch dma_set_mask override

2019-02-18T11:41:03Z

Instead of letting the architecture supply all of dma_set_mask just give it an additional hook selected by Kconfig. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman

powerpc/dma: stop overriding dma_get_required_mask

2019-02-18T11:41:03Z

The ppc_md and pci_controller_ops methods are unused now and can be removed. The dma_nommu implementation is generic to the generic one except for using max_pfn instead of calling into the memblock API, and all other dma_map_ops instances implement a method of their own. Signed-off-by: Christoph Hellwig Tested-by: Christian Zigotzky Signed-off-by: Michael Ellerman