linux.git/arch/powerpc/kernel/dma.c, branch v4.12

treewide: Move dma_ops from struct dev_archdata into struct device

2017-01-24T17:23:35+00:00

Some but not all architectures provide set_dma_ops(). Move dma_ops
from struct dev_archdata into struct device such that it becomes
possible on all architectures to configure dma_ops per device.

Signed-off-by: Bart Van Assche 
Acked-by: Greg Kroah-Hartman 
Cc: Benjamin Herrenschmidt 
Cc: Boris Ostrovsky 
Cc: David Woodhouse 
Cc: Juergen Gross 
Cc: H. Peter Anvin 
Cc: Ingo Molnar 
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Russell King 
Cc: x86@kernel.org
Signed-off-by: Doug Ledford

treewide: Constify most dma_map_ops structures

2017-01-24T17:23:35+00:00

Most dma_map_ops structures are never modified. Constify these
structures such that these can be write-protected. This patch
has been generated as follows:

git grep -l 'struct dma_map_ops' |
  xargs -d\\n sed -i \
    -e 's/struct dma_map_ops/const struct dma_map_ops/g' \
    -e 's/const struct dma_map_ops {/struct dma_map_ops {/g' \
    -e 's/^const struct dma_map_ops;$/struct dma_map_ops;/' \
    -e 's/const const struct dma_map_ops /const struct dma_map_ops /g';
sed -i -e 's/const \(struct dma_map_ops intel_dma_ops\)/\1/' \
  $(git grep -l 'struct dma_map_ops intel_dma_ops');
sed -i -e 's/const \(struct dma_map_ops dma_iommu_ops\)/\1/' \
  $(git grep -l 'struct dma_map_ops' | grep ^arch/powerpc);
sed -i -e '/^struct vmd_dev {$/,/^};$/ s/const \(struct dma_map_ops[[:blank:]]dma_ops;\)/\1/' \
       -e '/^static void vmd_setup_dma_ops/,/^}$/ s/const \(struct dma_map_ops \*dest\)/\1/' \
       -e 's/const \(struct dma_map_ops \*dest = \&vmd->dma_ops\)/\1/' \
    drivers/pci/host/*.c
sed -i -e '/^void __init pci_iommu_alloc(void)$/,/^}$/ s/dma_ops->/intel_dma_ops./' arch/ia64/kernel/pci-dma.c
sed -i -e 's/static const struct dma_map_ops sn_dma_ops/static struct dma_map_ops sn_dma_ops/' arch/ia64/sn/pci/pci_dma.c
sed -i -e 's/(const struct dma_map_ops \*)//' drivers/misc/mic/bus/vop_bus.c

Signed-off-by: Bart Van Assche 
Reviewed-by: Christoph Hellwig 
Cc: Benjamin Herrenschmidt 
Cc: Boris Ostrovsky 
Cc: David Woodhouse 
Cc: Juergen Gross 
Cc: H. Peter Anvin 
Cc: Ingo Molnar 
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Russell King 
Cc: x86@kernel.org
Signed-off-by: Doug Ledford

arch/powerpc: add option to skip DMA sync as a part of mapping

2016-12-15T00:04:07+00:00

This change allows us to pass DMA_ATTR_SKIP_CPU_SYNC which allows us to
avoid invoking cache line invalidation if the driver will just handle it
via a sync_for_cpu or sync_for_device call.

Link: http://lkml.kernel.org/r/20161110113534.76501.86492.stgit@ahduyck-blue-test.jf.intel.com
Signed-off-by: Alexander Duyck 
Acked-by: Michael Ellerman 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: use unsigned long for dma_attrs

2016-08-04T12:50:07+00:00

The dma-mapping core and the implementations do not change the DMA
attributes passed by pointer.  Thus the pointer can point to const data.
However the attributes do not have to be a bitfield.  Instead unsigned
long will do fine:

1. This is just simpler.  Both in terms of reading the code and setting
   attributes.  Instead of initializing local attributes on the stack
   and passing pointer to it to dma_set_attr(), just set the bits.

2. It brings safeness and checking for const correctness because the
   attributes are passed by value.

Semantic patches for this change (at least most of them):

    virtual patch
    virtual context

    @r@
    identifier f, attrs;

    @@
    f(...,
    - struct dma_attrs *attrs
    + unsigned long attrs
    , ...)
    {
    ...
    }

    @@
    identifier r.f;
    @@
    f(...,
    - NULL
    + 0
     )

and

    // Options: --all-includes
    virtual patch
    virtual context

    @r@
    identifier f, attrs;
    type t;

    @@
    t f(..., struct dma_attrs *attrs);

    @@
    identifier r.f;
    @@
    f(...,
    - NULL
    + 0
     )

Link: http://lkml.kernel.org/r/1468399300-5399-2-git-send-email-k.kozlowski@samsung.com
Signed-off-by: Krzysztof Kozlowski 
Acked-by: Vineet Gupta 
Acked-by: Robin Murphy 
Acked-by: Hans-Christian Noren Egtvedt 
Acked-by: Mark Salter  [c6x]
Acked-by: Jesper Nilsson  [cris]
Acked-by: Daniel Vetter  [drm]
Reviewed-by: Bart Van Assche 
Acked-by: Joerg Roedel  [iommu]
Acked-by: Fabien Dessenne  [bdisp]
Reviewed-by: Marek Szyprowski  [vb2-core]
Acked-by: David Vrabel  [xen]
Acked-by: Konrad Rzeszutek Wilk  [xen swiotlb]
Acked-by: Joerg Roedel  [iommu]
Acked-by: Richard Kuo  [hexagon]
Acked-by: Geert Uytterhoeven  [m68k]
Acked-by: Gerald Schaefer  [s390]
Acked-by: Bjorn Andersson 
Acked-by: Hans-Christian Noren Egtvedt  [avr32]
Acked-by: Vineet Gupta  [arc]
Acked-by: Robin Murphy  [arm64 and dma-iommu]
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

powerpc/dma: dma_set_coherent_mask() should not be GPL only

2015-10-28T05:20:50+00:00

When turning this from inline to an exported function I was a bit
over-eager and made it GPL only. This prevents the use of pretty much
all non-GPL PCI driver which is a bit over the top. Let's bring it
back in line with other architecture.

Fixes: 817820b0226a ("powerpc/iommu: Support "hybrid" iommu/direct DMA ops for coherent_mask < dma_mask")
Signed-off-by: Benjamin Herrenschmidt 
Signed-off-by: Michael Ellerman

powerpc/powernv: move dma_get_required_mask from pnv_phb to pci_controller_ops

2015-08-18T09:32:11+00:00

Simplify the dma_get_required_mask call chain by moving it from pnv_phb to
pci_controller_ops, similar to commit 763d2d8df1ee ("powerpc/powernv:
Move dma_set_mask from pnv_phb to pci_controller_ops").

Previous call chain:

  0) call dma_get_required_mask() (kernel/dma.c)
  1) call ppc_md.dma_get_required_mask, if it exists. On powernv, that
     points to pnv_dma_get_required_mask() (platforms/powernv/setup.c)
  2) device is PCI, therefore call pnv_pci_dma_get_required_mask()
     (platforms/powernv/pci.c)
  3) call phb->dma_get_required_mask if it exists
  4) it only exists in the ioda case, where it points to
       pnv_pci_ioda_dma_get_required_mask() (platforms/powernv/pci-ioda.c)

New call chain:

  0) call dma_get_required_mask() (kernel/dma.c)
  1) device is PCI, therefore call pci_controller_ops.dma_get_required_mask
     if it exists
  2) in the ioda case, that points to pnv_pci_ioda_dma_get_required_mask()
     (platforms/powernv/pci-ioda.c)

In the p5ioc2 case, the call chain remains the same -
dma_get_required_mask() does not find either a ppc_md call or
pci_controller_ops call, so it calls __dma_get_required_mask().

Signed-off-by: Andrew Donnellan 
Reviewed-by: Daniel Axtens 
Signed-off-by: Michael Ellerman

powerpc/iommu: Support "hybrid" iommu/direct DMA ops for coherent_mask < dma_mask

2015-07-13T00:10:55+00:00

This patch adds the ability to the DMA direct ops to fallback to the IOMMU
ops for coherent alloc/free if the coherent mask of the device isn't
suitable for accessing the direct DMA space and the device also happens
to have an active IOMMU table.

Signed-off-by: Benjamin Herrenschmidt 
Signed-off-by: Michael Ellerman

powerpc/pci: add dma_set_mask to pci_controller_ops

2015-06-02T03:18:49+00:00

Some systems only need to deal with DMA masks for PCI devices.
For these systems, we can avoid the need for a platform hook and
instead use a pci controller based hook.

Signed-off-by: Daniel Axtens 
Signed-off-by: Michael Ellerman

powerpc: Only do dynamic DMA zone limits on platforms that need it

2014-10-16T22:21:44+00:00

Scott's patch 1c98025c6c95 "Dynamic DMA zone limits" changed
dma_direct_alloc_coherent() to start using dev->coherent_dma_mask.

That seems fair enough, but it exposes the fact that some of the drivers
we care about on IBM platforms aren't setting the coherent mask.

The proper fix is to have drivers set the coherent mask and also have
the platform code honor it.

For now, just restrict the dynamic DMA zone limits to the platforms that
need it.

Signed-off-by: Michael Ellerman 
Acked-by: Scott Wood

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

2014-10-03T22:59:06+00:00

Freescale updates from Scott (27 commits):

  "Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit
   FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board
   support, and PrPMC PCI enumeration."