linux-stable.git/arch/powerpc/kernel/dma.c, branch master

powerpc/dma: use the generic direct mapping bypass

2019-02-18T11:41:04+00:00

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:04+00:00

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: use the dma-direct allocator for coherent platforms

2019-02-18T11:41:04+00:00

The generic code allows a few nice things such as node local allocations
and dipping into the CMA area.  The lookup of the right zone for a given
dma mask works a little different, but the results should be the same.

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:04+00:00

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:04+00:00

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:03+00:00

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

powerpc/dma: use phys_to_dma instead of get_dma_offset

2019-02-18T11:41:03+00:00

Use the standard portable helper instead of the powerpc specific one,
which is about to go away.

Signed-off-by: Christoph Hellwig 
Acked-by: Benjamin Herrenschmidt 
Tested-by: Christian Zigotzky 
Signed-off-by: Michael Ellerman

dma-mapping, powerpc: simplify the arch dma_set_mask override

2019-02-18T11:41:03+00:00

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: remove max_direct_dma_addr

2019-02-18T11:41:03+00:00

The max_direct_dma_addr duplicates the bus_dma_mask field in struct
device.  Use the generic field instead.

Signed-off-by: Christoph Hellwig 
Tested-by: Christian Zigotzky 
Signed-off-by: Michael Ellerman

powerpc/dma: remove the iommu fallback for coherent allocations

2019-02-18T11:41:03+00:00

All iommu capable platforms now always use the iommu code with the
internal bypass, so there is not need for this magic anymore.

Signed-off-by: Christoph Hellwig 
Tested-by: Christian Zigotzky 
Signed-off-by: Michael Ellerman